Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge latest RUC LSM into community develop #49

Merged
merged 32 commits into from
Mar 31, 2023
Merged

Merge latest RUC LSM into community develop #49

merged 32 commits into from
Mar 31, 2023

Conversation

tanyasmirnova
Copy link
Collaborator

  1. Updated computation of snow cover fraction and snow thermal conductivity
  2. Other changes that are implemented in the real-time RRFS_B.

@tanyasmirnova tanyasmirnova mentioned this pull request Mar 8, 2023
Merged
37 tasks
dustinswales
dustinswales previously requested changes Mar 16, 2023
View reviewed changes
Copy link
Collaborator

@dustinswales dustinswales left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this PR is still a draft, but we thought it was time it got some attention.
I have some suggestions and if you like, I can open a PR into this branch in the coming days?

physics/namelist_soilveg_ruc.F90 Outdated Show resolved Hide resolved
physics/module_sf_ruclsm.F90 Outdated Show resolved Hide resolved
physics/lsm_ruc.F90 Outdated Show resolved Hide resolved
physics/lsm_ruc.F90 Outdated Show resolved Hide resolved
physics/lsm_ruc.F90 Outdated Show resolved Hide resolved
physics/module_sf_ruclsm.F90 Outdated Show resolved Hide resolved
physics/module_sf_ruclsm.F90 Outdated Show resolved Hide resolved
physics/module_sf_ruclsm.F90 Outdated Show resolved Hide resolved
physics/module_sf_ruclsm.F90 Outdated Show resolved Hide resolved
physics/module_sf_ruclsm.F90 Outdated Show resolved Hide resolved
@tanyasmirnova tanyasmirnova changed the title Draft: merge latest RUC LSM into community develop Merge latest RUC LSM into community develop Mar 16, 2023
@tanyasmirnova
Taking care of Dustin Wales comments, removing unnecessary comments,
dcf8a31 
cleaning, etc.
@tanyasmirnova
Address reviewers comments in the RUC LSM driver.
5f43b2b
@tanyasmirnova
Clean-up print statements.
ebb0c17
@tanyasmirnova
Added table parameters for option 3 of snow cover fraction computation.
af1e1bc
@tanyasmirnova
Updated the sfc_diag.f that computes 2-m diagnostics. Should not
eb9b6b6 
affect results for physics suites not using RUC LSM.
@tanyasmirnova
In module_sf_ruclsm.F90 changes rellated to kind_physics.
706bc40
@tanyasmirnova
Fixed the problem in sfc_daig.f: it was using
01adfea 
"surface_exchange_coefficient_for_heat_at_2m" which is provided only by
MYNN surface layer scheme and not the others. Now this variable is
comuted internally in sfc_diag.f.
@tanyasmirnova
Continue changes for kind_phys with constants.
faba004
@tanyasmirnova
More changes related to kin_phys.
4a74783
@tanyasmirnova
More changes in RUC LSM related to kind_phys.
94ff8a2
@grantfirl
Copy link
Collaborator

grantfirl commented Mar 22, 2023 •
edited
Loading

@tanyasmirnova I noticed that this PR is undoing some recent changes in ccpp-physics. Can you please merge the latest ufs/dev branch into your PR branch to make reviewing easier?

grantfirl
grantfirl reviewed Mar 22, 2023
View reviewed changes
physics/GFS_debug.F90 Outdated Show resolved Hide resolved
grantfirl
grantfirl reviewed Mar 22, 2023
View reviewed changes
physics/GFS_debug.F90 Outdated Show resolved Hide resolved
grantfirl
grantfirl reviewed Mar 22, 2023
View reviewed changes
physics/lsm_ruc.F90 Outdated Show resolved Hide resolved
grantfirl
grantfirl reviewed Mar 22, 2023
View reviewed changes
physics/lsm_ruc.F90 Outdated Show resolved Hide resolved
grantfirl
grantfirl reviewed Mar 22, 2023
View reviewed changes
physics/lsm_ruc.F90 Outdated Show resolved Hide resolved
grantfirl
grantfirl reviewed Mar 22, 2023
View reviewed changes
physics/lsm_ruc.meta Outdated Show resolved Hide resolved
grantfirl
grantfirl reviewed Mar 22, 2023
View reviewed changes
physics/lsm_ruc.meta Outdated Show resolved Hide resolved
grantfirl
grantfirl reviewed Mar 22, 2023
View reviewed changes
physics/sfc_diag.f Outdated Show resolved Hide resolved
@tanyasmirnova
In GFS_diag.F90 moved Trans variable from Diag DDT to GFS_diagtoscree…
0dbe50a 
…n. Uncommented snowd_land, and

removed snowd_water.
tanyasmirnova and others added 14 commits March 22, 2023 22:05
@tanyasmirnova
More changes related to kind_phys. Use constants from Physcons.
777637b
@tanyasmirnova
Use constants from host in RUC LSM driver.
f10866c
@tanyasmirnova
Removed wet - not used. Also rename rocp into con_rocp
4933f03
@tanyasmirnova
More changes in RUC LSM related to kind_phys and use of constants from
f7839de 
Physcons.
@tanyasmirnova
Changes related to kind_phys.
3105170
@tanyasmirnova
Moved RUC LSM options to namelist parameters. Also, some clean-up of
6572200 
print statements.
@tanyasmirnova
Surface_snow_amount_vardens_over_land is changed to surface_snow_amou…
98426ea 
…nt_vardens_over_land

Same for ice.
@tanyasmirnova
Active = (control_for_land_surface_scheme == identifier_for_ruc_land_…
1f2b01c 
…surface_scheme) is removed.
@SamuelTrahanNOAA
Merge remote-tracking branch 'upstream/ufs/dev' into ufsdev_ruclsm
d349219
@joeolson42
Updates to the MYNN surface-layer scheme
48e092f
@tanyasmirnova
Modifications to 2-m diagnostics will affect the results only with th…
46bcac5 
…e use of RUC LSM.
@tanyasmirnova
Use q1(i) instead of q1c in original diagnostics.
1804b5f
@tanyasmirnova
Replaced double precision zero with 0. as it was in the original vers…
fe94d71 
…ion.
@joeolson42
Merge branch 'ufs/dev' into mynnsfc_24March
4f8f388
@grantfirl grantfirl mentioned this pull request Mar 28, 2023
Merged
@zach1221
Copy link

Hello, I think we're ready to continue working towards merging #1646. @tanyasmirnova are you able to resolve the conversations in this PR and request final approval?

@tanyasmirnova
Copy link
Collaborator Author

@zach1221 I resolved all reviewer's comments and would like to get final approvals from reviewers.

grantfirl
grantfirl approved these changes Mar 31, 2023
View reviewed changes
Copy link
Collaborator

@grantfirl grantfirl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll clean up use of physcons later since all testing has been done.

@grantfirl grantfirl dismissed dustinswales’s stale review March 31, 2023 18:55

The developer has addressed comments and testing is finished for this work. We need to merge to meet deadlines.

@jkbk2004
Copy link

@grantfirl all tests are done: ufs-community/ufs-weather-model#1646. can you go ahead to merge this pr? @dustinswales can you approve the pr?

@grantfirl grantfirl merged commit a11db78 into ufs-community:ufs/dev Mar 31, 2023
This was referenced Mar 31, 2023
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@grantfirl grantfirl grantfirl approved these changes

@ChunxiZhang-NOAA ChunxiZhang-NOAA Awaiting requested review from ChunxiZhang-NOAA

@dustinswales dustinswales Awaiting requested review from dustinswales dustinswales is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@tanyasmirnova @grantfirl @zach1221 @jkbk2004 @dustinswales @SamuelTrahanNOAA @joeolson42